From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 31 Jan 2024 15:36:55 +0000 (+0100)
Subject: dbusServices: Always import dbus errors
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~281^2~2^2~51
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9e96e8495bbdcd42969dbb7dc432cf59215a0e6b;p=gnome-shell.git

dbusServices: Always import dbus errors

This makes sure custom errors are registered correctly, even when
the service doesn't do anything other than passing them on.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3159>
---

diff --git a/js/dbusServices/dbusService.js b/js/dbusServices/dbusService.js
index ab7af9291..941deaf29 100644
--- a/js/dbusServices/dbusService.js
+++ b/js/dbusServices/dbusService.js
@@ -3,6 +3,8 @@ import GLib from 'gi://GLib';
 
 import {programArgs} from 'system';
 
+import './misc/dbusErrors.js';
+
 const Signals = imports.signals;
 
 const IDLE_SHUTDOWN_TIME = 2; // s
diff --git a/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml b/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml
index d77f72a68..b0179238d 100644
--- a/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml
+++ b/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml
@@ -6,6 +6,7 @@
     <file>dbusService.js</file>
 
     <file>misc/config.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/dbusUtils.js</file>
   </gresource>
 </gresources>
diff --git a/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml b/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
index 5db7b115f..a233986a8 100644
--- a/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
@@ -12,6 +12,7 @@
     <file>misc/config.js</file>
     <file>misc/errorUtils.js</file>
     <file>misc/extensionUtils.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/dbusUtils.js</file>
     <file>misc/params.js</file>
   </gresource>
diff --git a/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml b/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
index 4e039ba69..e3e3b4023 100644
--- a/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
@@ -6,6 +6,7 @@
     <file>dbusService.js</file>
 
     <file>misc/config.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/dbusUtils.js</file>
   </gresource>
 </gresources>
diff --git a/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml b/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
index a247050e3..d07a3ec7f 100644
--- a/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
@@ -7,6 +7,7 @@
 
     <file>misc/config.js</file>
     <file>misc/dbusUtils.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/signals.js</file>
     <file>misc/signalTracker.js</file>
   </gresource>